Re-enable gjs tests on architectures where it is available

diff --git a/debian/control b/debian/control
index 116f4c86f4a8327f418dae7a081ea3fd7b7c7b19..58652f95984c1c6440ca3b389419959f21e1101c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Build-Depends:
  e2fslibs-dev,
  elfutils,
  fuse,
+ gjs [!alpha !hppa !ia64 !m68k !sh4 !sparc64 !x32],
  gnupg <!nocheck>,
  gobject-introspection,
  gtk-doc-tools <!nodoc>,
@@ -188,7 +189,7 @@ Depends:
  cpio,
  fuse,
  gir1.2-ostree-1.0,
- gjs [!sparc64],
+ gjs [!alpha !hppa !ia64 !m68k !sh4 !sparc64 !x32],
  gnupg,
  ostree,
  python3,

diff --git a/debian/ostree-tests.lintian-overrides b/debian/ostree-tests.lintian-overrides
index a2e022ebf7b8bfa67137d36200975b2ece80302b..f8daa2699145f157c3e19376f0f7caf027947f38 100644 (file)
--- a/debian/ostree-tests.lintian-overrides
+++ b/debian/ostree-tests.lintian-overrides
@@ -6,10 +6,11 @@ ostree-tests: extra-license-file usr/libexec/installed-tests/libostree/gpg-verif
 # This is deliberate, working around the assumption of recursive make
 ostree-tests: symlink-is-self-recursive usr/libexec/installed-tests/libostree/tests .
 
-# gjs has been broken on sparc64 for a while.
+# gjs has been broken on sparc64 for a while, and is missing on the
+# other architectures mentioned here.
 # The test that runs this script is automatically skipped if gjs isn't
 # present.
-[sparc64]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
+[alpha hppa ia64 m68k sh4 sparc64 x32]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
 
 # This shared object genuinely doesn't use any libc ABIs directly,
 # only via GLib

diff --git a/debian/rules b/debian/rules
index 8d9275baa1284d33ee5e1b5e6be694273f52cc42..3f4dff895c816ce4205cf7bffcd4cdcd01d30831 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,6 @@ override_dh_autoreconf:
        env NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
 configure_options = \
-       GJS=some-nonexistent-gjs-binary \
        --enable-installed-tests \
        --with-avahi \
        --with-dracut \